debian/rules, debian/ostree-tests.install: adjust for new installation directory...

diff --git a/debian/changelog b/debian/changelog
index 1854104662e46fc48d1921cd0b10afed13cf93c0..d93c11b88ebabc93d0e388c5474a1f4784738209 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ostree (2016.4-1) UNRELEASED; urgency=medium
     - debian/libostree-1-1.symbols: update for new versioned symbols
     - Build-depend on libmount-dev
     - debian/copyright: update
+    - debian/rules, debian/ostree-tests.install: adjust for new installation
+      directory for installed-tests
   * debian/gbp.conf: use DEP-14 branch names
   * Fix ITP bug number in changelog (was #813308, should have been #697477)
   * debian/control: build-depend on attr, for the tests (only required if

diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install
index d536574a58a5b6c4c64e533fb8ba05696be832d8..42a298792f18dea0c8beb1f3a68b4f25d82ce300 100644 (file)
--- a/debian/ostree-tests.install
+++ b/debian/ostree-tests.install
@@ -1,2 +1,2 @@
-usr/lib/ostree/installed-tests
+usr/lib/installed-tests/ostree
 usr/share/installed-tests/ostree

diff --git a/debian/rules b/debian/rules
index e999af75cb649fe42a31087759c6b4d7e17794b6..ad3e8576d5a564ae67c4eb48d56692b802f923bf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,20 +36,20 @@ override_dh_auto_test:
 
 override_dh_install:
        rm -f debian/tmp/usr/lib/*/*.la
-       rm -f debian/tmp/usr/lib/ostree/installed-tests/*.la
+       rm -f debian/tmp/usr/lib/installed-tests/ostree/*.la
        dh_install --fail-missing
 
 override_dh_makeshlibs:
        # this is an LD_PRELOAD, not a real shared library
-       dh_makeshlibs -Xostree/installed-tests/libreaddir-rand.so
+       dh_makeshlibs -Xinstalled-tests/ostree/libreaddir-rand.so
 
 override_dh_fixperms-arch:
        dh_fixperms -X'*.js'
-       chmod -v 0755 debian/ostree-tests/usr/lib/ostree/installed-tests/*.js
-       chmod -v 0755 debian/ostree-tests/usr/lib/ostree/installed-tests/*.py
-       chmod -v 0755 debian/ostree-tests/usr/lib/ostree/installed-tests/*.sh
+       chmod -v 0755 debian/ostree-tests/usr/lib/installed-tests/ostree/*.js
+       chmod -v 0755 debian/ostree-tests/usr/lib/installed-tests/ostree/*.py
+       chmod -v 0755 debian/ostree-tests/usr/lib/installed-tests/ostree/*.sh
        # this one is a library, not a script
-       chmod -v 0644 debian/ostree-tests/usr/lib/ostree/installed-tests/libtest.sh
+       chmod -v 0644 debian/ostree-tests/usr/lib/installed-tests/ostree/libtest.sh
 
 override_dh_systemd_start:
        dh_systemd_start --no-start